Merge tag 'upstream/3.001.007'
authorgregor herrmann <gregoa@debian.org>
Mon, 4 Aug 2014 22:28:27 +0000 (00:28 +0200)
committergregor herrmann <gregoa@debian.org>
Mon, 4 Aug 2014 22:28:27 +0000 (00:28 +0200)
commit79b49c2de325279953182650dc187e572bb87008
treecbc10235118d20badd5b371fa9648484a983d6f3
parenteb4b42f09ade63d88b1b527c8db4832c66a5e521
parent0c91bdbd892014cd7b47de5395a2e35ac0af3f7a
Merge tag 'upstream/3.001.007'

Upstream version 3.001.007